merge trunk
authorKenichi Handa <handa@etlken>
Fri, 9 Jul 2010 06:55:27 +0000 (15:55 +0900)
committerKenichi Handa <handa@etlken>
Fri, 9 Jul 2010 06:55:27 +0000 (15:55 +0900)
commitba1bbe87aa207be62a4d6f2f60ce6520e26061c4
tree766da063cae8f16083ae3d60bd072d5cb9d86dcb
parent2863bbcf9636c9451b6424d554468c2ec1515743
parente75391a438a1198a53e0eb93bc34ce6e0edf3dcf
merge trunk
src/font.c